merge trunk
authorKenichi Handa <handa@etlken>
Mon, 10 May 2010 03:37:03 +0000 (12:37 +0900)
committerKenichi Handa <handa@etlken>
Mon, 10 May 2010 03:37:03 +0000 (12:37 +0900)
commiteace76c0d470e5fc076771f093df51917eebf061
tree916d90b904adb528e6c6b9c0b6257e8330badd11
parentf6e1c5151cd2e163230c5f9417e76bf85f2a8230
parentb35c7f0886d1249d5d03d17b08792b5bba9fbda7
merge trunk